From 9d663990948b42c2c889ec54ec66c3dd3fc72b10 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Mon, 25 Jun 2007 19:54:04 +0000 Subject: [PATCH] Don't steal menu events while the keyboard is grabbed. 2007-06-25 Richard Hult * gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Don't steal menu events while the keyboard is grabbed. svn path=/trunk/; revision=18231 --- ChangeLog | 5 +++++ gdk/quartz/gdkevents-quartz.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fd10cbd200..d587b2956a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-25 Richard Hult + + * gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Don't steal + menu events while the keyboard is grabbed. + 2007-06-25 Richard Hult * gdk/quartz/Makefile.am: diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index b1b39e092f..c2a73c27c4 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1533,7 +1533,9 @@ gdk_event_translate (NSEvent *nsevent) /* Special-case menu shortcut events. We create command events for * those and forward to the corresponding menu. */ - if ([nsevent type] == NSKeyDown) + if ((!_gdk_quartz_keyboard_grab_window || + (_gdk_quartz_keyboard_grab_window && keyboard_grab_owner_events)) && + [nsevent type] == NSKeyDown) { EventRef event_ref; MenuRef menu_ref; -- 2.30.2